Browse Source

修复匹配不到药品的问题

lighter 3 years ago
parent
commit
fa751b5ce6

+ 2 - 2
src/main/java/thyyxxk/webserver/dao/his/nationalmatch/NationalMatchDao.java

@@ -88,11 +88,11 @@ public interface NationalMatchDao {
     @Update("update zd_charge_item set new_name=name where new_name is null")
     void asyncNewNameForServices();
 
-    @Select("select code as nationalCode,drug_trade_name as nationalName,drug_dosage_forms as actualDosage, " +
+    @Select("select code as nationalCode,registration_name as nationalName,drug_dosage_forms as actualDosage, " +
             "specifications=(drug_specifications+' x'+minimum_packing_quantity+minimum_preparation_unit+'/'+minimum_packing_unit), " +
             "packaging_material as packingMaterial,production_name as factory,license_number as approvalNumber, " +
             "drug_supervision_local_code as drugStandardCode,start_time,end_time from t_si_dl_ptnt_wstn_mdcn " +
-            "where drug_trade_name like #{name} and license_number like #{approve}")
+            "where registration_name like #{name} and license_number like #{approve}")
     List<SiCentralMedicine> selectNationalMedicines(@Param("name") String name, @Param("approve") String approve);
 
     @Select("select code as nationalCode,monoo_name as nationalName,start_time,end_time " +

+ 2 - 2
src/main/java/thyyxxk/webserver/entity/medicalinsurance/download/SiDlPtntWstnMdcn.java

@@ -499,7 +499,7 @@ public class SiDlPtntWstnMdcn implements Serializable {
 		registrationDosageType = arr[15];
 		registrationSpecifications = arr[16];
 		registrationSpecificationCode = arr[17];
-		eachDosage = arr[18];
+//		eachDosage = arr[18];
 		frequencyOfUsage = arr[19];
 		aateGroup = arr[20];
 		nationalDrugNo = arr[21];
@@ -514,7 +514,7 @@ public class SiDlPtntWstnMdcn implements Serializable {
 		packagingMaterialName = arr[30];
 		packingSpecifications = arr[31];
 		packageQuantity = arr[32];
-		functionalGovernance = arr[33];
+//		functionalGovernance = arr[33];
 		routeOfMedication = arr[34];
 		instructions = arr[35];
 		startTime = arr[36];

+ 2 - 0
src/main/java/thyyxxk/webserver/service/yibao/DictionaryService.java

@@ -128,6 +128,8 @@ public class DictionaryService {
 
     public ResultVo<List<PureCodeName>> searchYbDiag(SearchDataParam param) {
         ResultVo<List<PureCodeName>> res;
+//        if (param.getMedType().equals(MedType.SELF_PAY.getCode())) {
+//        }
         if (param.getMedType().equals(MedType.MATERNITY_HOSPITALIZATION.getCode())) {
             res = getMaternDiagsForFrontSheet(param);
         } else if (param.getMedType().equals(MedType.SINGLE_DISEASE_HOSPITALIZATION.getCode())) {