xiaochan 2 hónapja
szülő
commit
20dc702e12

+ 1 - 0
src/main/java/thyyxxk/webserver/controller/LoginController.java

@@ -35,6 +35,7 @@ public class LoginController {
     }
 
     @GetMapping("/simpleLogin")
+    @PassToken
     public ResultVo<UserInfo> simpleLogin(@RequestParam("code") String code) {
         return service.simpleLogin(code);
     }

+ 2 - 1
src/main/java/thyyxxk/webserver/dao/his/zhuyuanyiji/MenZhengXiangMuDao.java

@@ -95,7 +95,8 @@ public interface MenZhengXiangMuDao {
                                       @Param("times") Integer times,
                                       @Param("xiangMuZhuangTai") Integer xiangMuZhuangTai);
 
-    @Select("select tc_name,quantity,group_order, drug_quan from mz_charge_detail where patient_id=#{patientNo} " +
+    @Select("select tc_name,quantity,group_order, drug_quan, drugUnitName = (select name from yp_zd_unit where drug_unit = code) " +
+            " from mz_charge_detail where patient_id=#{patientNo} " +
             "and serial_no=#{realNo} and times=#{times} and group_no!='00'")
     List<MzChargeDetail> yaoPinXinxi(@Param("realNo") Integer realNo,
                                      @Param("patientNo") String patientNo,

+ 4 - 0
src/main/java/thyyxxk/webserver/entity/datamodify/MzChargeDetail.java

@@ -233,6 +233,10 @@ public class MzChargeDetail implements Serializable {
      * drugUnit
      */
     private String drugUnit;
+    /**
+     * drugUnitName
+     */
+    private String drugUnitName;
     /**
      * doctorFlag
      */