wangzhinan 8 mesi fa
parent
commit
35fc349691

+ 0 - 1
business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/HcyyPrescriptionService.java

@ -1807,7 +1807,6 @@ public class HcyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
                                    medicalMxDO.setItemCode(dobject.getString("MED_LIST_CODG"));
                                    medicalMxDO.setPrescriptionCode(dobject.getString(""));
                                    medicalMxDO.setChargeUnit(dobject.getString("PRCUNT"));
                                    medicalMxDO.setSpecificationType(dobject.getString(""));
                                    medicalMxDO.setAmount(dobject.getString("CNT"));
                                    medicalMxDO.setPrice(dobject.getString("PRIC"));
                                    medicalMxDO.setPrescriptionCode(dobject.getString("RXNO"));

+ 7 - 1
business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/EntranceService.java

@ -2594,6 +2594,11 @@ public class EntranceService {
                                    }
                                    logger.info("xgszType=="+xgszType);
                                }
                                String del = "1";
                                net.sf.json.JSONObject doctorInfo = MS020141(demoFlag,doctorCode);
                                if (doctorInfo==null){
                                    del="0";
                                }
                                if (idCard.equalsIgnoreCase(idcard)){
                                    jsonObject1 = jsonObjectBody;
                                    List<BaseDoctorDO> baseDoctorDOS = baseDoctorDao.findByIdcard(idCard);
@ -2602,6 +2607,7 @@ public class EntranceService {
                                        String disableFlag = null == jsonObjectBody.get("Disable_Flag") ? "" : jsonObjectBody.get("Disable_Flag").toString();
                                        //互联网医院:1停用,0使用  转 i健康:1正常,0作废
                                /*        baseDoctorDO.setDel("1".equals(disableFlag) ? "0" : "1");*/
                                        baseDoctorDO.setDel(del);
                                        doctorName = null == jsonObjectBody.get("Emp_Name") ? "" : jsonObjectBody.get("Emp_Name").toString();
                                        baseDoctorDO.setName(doctorName);
                                        if ("0".equalsIgnoreCase(disableFlag)){
@ -2619,7 +2625,7 @@ public class EntranceService {
                                        baseDoctorDO.setEnabled(1);
                                        String disableFlag = null == jsonObjectBody.get("Disable_Flag") ? "" : jsonObjectBody.get("Disable_Flag").toString();
                                        //互联网医院:1停用,0使用  转 i健康:1正常,0作废
                                        baseDoctorDO.setDel("1".equals(disableFlag) ? "0" : "1");
                                        baseDoctorDO.setDel(del);
                                        if ("0".equalsIgnoreCase(disableFlag)){
                                            baseDoctorDO.setAtddrNo(atddrNo);
                                        }