Browse Source

层级优化2

wangfeng 4 years ago
parent
commit
3f4fc6508a
1 changed files with 7 additions and 3 deletions
  1. 7 3
      src/main/java/com/diagbot/facade/KlDiagnoseFacade.java

+ 7 - 3
src/main/java/com/diagbot/facade/KlDiagnoseFacade.java

@@ -222,15 +222,19 @@ public class KlDiagnoseFacade extends KlDiagnoseServiceImpl {
     public Boolean saveCommon(KlDiagnoseSaveVO klDiagnoseSaveVO) {
     public Boolean saveCommon(KlDiagnoseSaveVO klDiagnoseSaveVO) {
         Date now = DateUtil.now();
         Date now = DateUtil.now();
         boolean res = false;
         boolean res = false;
+        int sum = 99;
+        int baseGroup = 9;
         List<KlDiagnoseTypeVO> klDiagnoseTypeVO = klDiagnoseSaveVO.getKlDiagnoseTypeVO();
         List<KlDiagnoseTypeVO> klDiagnoseTypeVO = klDiagnoseSaveVO.getKlDiagnoseTypeVO();
         for (KlDiagnoseTypeVO data : klDiagnoseTypeVO) {
         for (KlDiagnoseTypeVO data : klDiagnoseTypeVO) {
             KlDiagnoseCondition klDiagnoseCondition = new KlDiagnoseCondition();
             KlDiagnoseCondition klDiagnoseCondition = new KlDiagnoseCondition();
             klDiagnoseCondition.setConditionType(data.getConditionType());//取出诊断的类型,2拟诊,3 确诊
             klDiagnoseCondition.setConditionType(data.getConditionType());//取出诊断的类型,2拟诊,3 确诊
+            sum=sum+1;
+            klDiagnoseCondition.setConditionGroup(sum);
             List<KlDiagnoseGroupVO> groupVO = data.getGroupVO();
             List<KlDiagnoseGroupVO> groupVO = data.getGroupVO();
             for (KlDiagnoseGroupVO data2 : groupVO) {
             for (KlDiagnoseGroupVO data2 : groupVO) {
+                baseGroup = baseGroup+1;
                 klDiagnoseCondition.setDiagnoseId(klDiagnoseSaveVO.getId());
                 klDiagnoseCondition.setDiagnoseId(klDiagnoseSaveVO.getId());
-                klDiagnoseCondition.setBaseGroup(data2.getBaseGroup());//
-                klDiagnoseCondition.setConditionGroup(data2.getConditionGroup());
+                klDiagnoseCondition.setBaseGroup(baseGroup);//
                 klDiagnoseCondition.setFitNo(data2.getFitNo());
                 klDiagnoseCondition.setFitNo(data2.getFitNo());
                 klDiagnoseConditionFacade.save(klDiagnoseCondition);
                 klDiagnoseConditionFacade.save(klDiagnoseCondition);
                 //明细
                 //明细
@@ -255,7 +259,7 @@ public class KlDiagnoseFacade extends KlDiagnoseServiceImpl {
                     if (res) {
                     if (res) {
                         KlDiagnoseCondition klDiagnoseConditionBase = new KlDiagnoseCondition();
                         KlDiagnoseCondition klDiagnoseConditionBase = new KlDiagnoseCondition();
                         klDiagnoseConditionBase.setDiagnoseBaseId(klDiagnoseBase.getId());
                         klDiagnoseConditionBase.setDiagnoseBaseId(klDiagnoseBase.getId());
-                        klDiagnoseConditionBase.setBaseGroup(data2.getBaseGroup());
+                        klDiagnoseConditionBase.setBaseGroup(baseGroup);
                         klDiagnoseConditionBase.setConditionType(1);
                         klDiagnoseConditionBase.setConditionType(1);
                         klDiagnoseConditionBase.setDiagnoseId(klDiagnoseSaveVO.getId());
                         klDiagnoseConditionBase.setDiagnoseId(klDiagnoseSaveVO.getId());
                         res = klDiagnoseConditionFacade.save(klDiagnoseConditionBase);
                         res = klDiagnoseConditionFacade.save(klDiagnoseConditionBase);