Merge remote-tracking branch 'origin/debug' into dev-template

Conflicts:
	kernel/src/main/resources/cache/3/module_mapping.json

kernel/src/main/java/com/lantone/qc/kernel/util/CacheUtil.java

@@ -70,7 +70,7 @@ public class CacheUtil implements ApplicationRunner {
             File targetFile = new File("module_mapping.json");
             FileUtils.copyInputStreamToFile(stream, targetFile);
             String mappingMsg = FileUtils.readFileToString(targetFile);
-            logger.error("模板数据："+mappingMsg);
+//            logger.error("模板数据："+mappingMsg);
 
 //            String path = ResourceUtils.getURL("classpath:").getPath() + "cache/" + hospitalId + "/module_mapping.json";
 //            String mappingMsg = FileUtil.fileRead(path);

trans/src/main/java/com/lantone/qc/trans/taizhou/TaiZhouConsultationDocTrans.java

@@ -183,8 +183,6 @@ public class TaiZhouConsultationDocTrans extends ModelDocTrans {
             "会诊理由和目的=申请理由目的",
             "本人姓名=姓名",
             "病历号=病案号",
-            "会诊科室=受邀科室",
-            "申请医生=签名",
             "临床科室=申请科室"
     );
 

trans/src/main/java/com/lantone/qc/trans/taizhou/TaiZhouFirstCourseRecordDocTrans.java

@@ -70,7 +70,7 @@ public class TaiZhouFirstCourseRecordDocTrans extends ModelDocTrans {
     }
 
     private List<String> keyContrasts = Lists.newArrayList(
-            //            "医生=记录医师",
+                        "本人姓名=姓名",
             "现病史- 发病情况=发病经过",
             "治疗计划和措施=治疗计划",
             "体温(耳)=体温耳",