Browse Source

手术分值返回最大值

lighter 3 years ago
parent
commit
693d5de775

+ 1 - 1
pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>thyyxxk</groupId>
     <artifactId>web-server</artifactId>
-    <version>2</version>
+    <version>1</version>
     <name>web-server</name>
     <description>server for yibao-web</description>
     <properties>

+ 3 - 0
src/main/java/thyyxxk/webserver/entity/casefrontsheet/OprnDisefamilyGrade.java

@@ -33,4 +33,7 @@ public class OprnDisefamilyGrade implements Serializable {
 	 */
 	private String disefamilyName;
 
+	public Integer getOprnGrade() {
+		return null == oprnGrade ? 0 : oprnGrade;
+	}
 }

+ 7 - 1
src/main/java/thyyxxk/webserver/service/casefrontsheet/CaseFrontSheetService.java

@@ -643,11 +643,17 @@ public class CaseFrontSheetService {
             return ResultVoUtil.success("有对照的非手术分值:" + disefamilyGrade.getNoneOprnGrade());
         }
         List<OprnDisefamilyGrade> oprnGrades = dao.selectOperationDisefamilies(disefamilyGrade.getDisefamilyCode());
+        int ssfz = 0;
         for (OprnDisefamilyGrade oprn : oprnGrades) {
             if (surgeries.contains(oprn.getOprnCode())) {
-                return ResultVoUtil.success("有对照的手术分值:" + oprn.getOprnGrade());
+                if (oprn.getOprnGrade() > ssfz) {
+                    ssfz = oprn.getOprnGrade();
+                }
             }
         }
+        if (ssfz != 0) {
+            return ResultVoUtil.success("有对照的手术分值:" + ssfz);
+        }
         return ResultVoUtil.success("有对照的非手术分值:" + disefamilyGrade.getNoneOprnGrade());
     }
 

+ 1 - 1
src/main/resources/application.yml

@@ -8,7 +8,7 @@ spring:
     cache: false
   datasource:
     dynamic:
-      primary: dev
+      primary: his
       strict: false
       datasource:
         his: