Merge remote-tracking branch 'origin/beilun/dev' into beilun/dev

kernel/src/main/java/com/lantone/qc/kernel/analysis/QCAnalysis.java

@@ -102,11 +102,14 @@ public class QCAnalysis {
     private void sym(QueryVo queryVo,InputInfo inputInfo){
         try{
             Lis lis = new Lis();
+            lis.setLisId("rec"+System.currentTimeMillis());
+            lis.setHospitalId(Long.parseLong(queryVo.getHospitalId()));
             lis.setPackageId(queryVo.getHospitalId());
             lis.setPackageName(queryVo.getBehospitalInfo().getBehospitalCode());
             lis.setRemark(inputInfo.getBeHospitalizedDoc().getPresentLabel().getText());
             lisService.save(lis);
         }catch (Exception e){
+            log.error(e.getMessage(),e);
         }
 
     }

trans/src/main/java/com/lantone/qc/trans/hangzhoudiqi/QiYuanFirstPageRecordDocTrans.java

@@ -42,7 +42,7 @@ public class QiYuanFirstPageRecordDocTrans extends ModelDocTrans {
         structureExtMap.put(Content.operative_information, FastJsonUtils.getJsonToBean(content.get(Content.operative_information), Object.class));
         structureExtMap.put(Content.dischargeDiag, FastJsonUtils.getJsonToBean(content.get(Content.dischargeDiag), Object.class));
         //义乌组织机构id存id编号
-        structureExtMap.put("ID编号", FastJsonUtils.getJsonToBean(content.get(Content.hospital_code), Object.class));
+//        structureExtMap.put("ID编号", FastJsonUtils.getJsonToBean(content.get(Content.hospital_code), Object.class));
 
         List<Map<String, String>> dischargeDiag = (List) structureExtMap.get(Content.dischargeDiag);
         if (dischargeDiag != null && dischargeDiag.size() > 0) {