Merge branch '2.0' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into 2.0

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/dao/OutpatientDao.java

@@ -15,7 +15,7 @@ import java.util.List;
 */
public interface OutpatientDao extends JpaRepository<WlyyOutpatientDO, String>, JpaSpecificationExecutor<WlyyOutpatientDO> {
    @Query("from WlyyOutpatientDO a where a.patient = ?1 and a.outpatientType <> '3' and a.outpatientType <> '4' and a.status in(0,1,2)")
    @Query("from WlyyOutpatientDO a where a.patient = ?1 and a.outpatientType <> '3' and a.outpatientType <> '4' and a.outpatientType <> '5' and a.status in(0,1,2)")
    List<WlyyOutpatientDO> findByPatientList(String patient);
    @Query("from WlyyOutpatientDO a where a.patient = ?1 and  a.outpatientType = ?2 and a.status in('0','1','2')")
    List<WlyyOutpatientDO> findByPatientAndDoctorList(String patient,String outpatientType);

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/DsyyPrescriptionService.java

@@ -121,7 +121,7 @@ public class DsyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
        return dsyyEntranceService.selectOutpatientInfo(patient,conNo);
    }
    public String isEmty(String str){
        if (str.equalsIgnoreCase("[]")){
        if (!StringUtils.isNoneBlank(str)){
            return null;
        }else {
            return str;
@@ -136,12 +136,19 @@ public class DsyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
     * @param realOrder 处方号
     * @return
     */
    public List<WlyyPrescriptionVO> selectOriginPrescriptionList(String registerSn, String patNo, String admNo, String realOrder) throws Exception {
    public List<WlyyPrescriptionVO> selectOriginPrescriptionList(String registerSn, String patient, String admNo, String realOrder) throws Exception {
        List<WlyyPrescriptionVO> prescriptionVOList = new ArrayList<>();
        String response="";
        String params = "";
        if (StringUtils.isNoneBlank(realOrder)){
            params +="&realOrder="+realOrder;
        BasePatientDO patientDO = patientDao.findById(patient).orElse(null);
        if (patientDO==null){
            return null;
        }
        PatientMappingDO patientMappingDO = patientMappingDao.findByIdcardAndSource(patientDO.getIdcard(),"1");
        String patNo = "";
        if (patientMappingDO!=null){
            patNo = patientMappingDO.getMappingCode();
        }
        if (StringUtils.isBlank(patNo)) {
            return null;
        }
        logger.info("处方request:"+registerSn+"=="+patNo+"==="+admNo+"===="+realOrder);
        JSONArray array = dsyyEntranceService.getOriginPrescriptionList(registerSn,patNo,admNo,realOrder,null,null);
@@ -204,7 +211,7 @@ public class DsyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
            wlyyPrescriptionVO.setDispDate(DateUtil.strToDate(isEmty(jsonObject.getString("DISPDATE"))));
            //诊断
            JSONArray jsonArray = dsyyEntranceService.getOutpatientDiagnosis(registerSn,patNo,admNo,realOrder,null,null);
            JSONArray jsonArray = dsyyEntranceService.getOutpatientDiagnosis(registerSn);
            logger.info("诊断"+jsonArray.toJSONString());
            List<WlyyPrescriptionDiagnosisVO> prescriptionDiagnosisVOS = new ArrayList<>();
@@ -213,13 +220,12 @@ public class DsyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
                WlyyPrescriptionDiagnosisVO prescriptionDiagnosisVO = new WlyyPrescriptionDiagnosisVO();
                prescriptionDiagnosisVO.setCode(isEmty(disagnosisJson.getString("CODE")));
                prescriptionDiagnosisVO.setName(isEmty(disagnosisJson.getString("NAME")));
                prescriptionDiagnosisVO.setType(isEmty(disagnosisJson.getString("TYPE"))==null?null:Integer.parseInt(disagnosisJson.getString("DIAGNOSETYPE")));
                prescriptionDiagnosisVOS.add(prescriptionDiagnosisVO);
            }
            wlyyPrescriptionVO.setDiagnosisVOs(prescriptionDiagnosisVOS);
            //药品
            JSONArray infoArray = dsyyEntranceService.getOutpatientDrugInfo(registerSn,patNo,admNo,realOrder,null,null);
            JSONArray infoArray = dsyyEntranceService.getOutpatientDrugInfo(wlyyPrescriptionVO.getRealOrder());
            //药品
            List<WlyyPrescriptionInfoVO> wlyyPrescriptionInfoVOList = new ArrayList<>();
            for (int j=0;j<infoArray.size();j++){
@@ -1671,7 +1677,13 @@ public class DsyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
                    return null;
                }
            }else {
                return null;
                String cardNo = outpatientDO.getCardNo();
                String isExpress = "0";
                String sfOrder = "";
                String address ="";
                String phone = expressageDO.getMobile();
                String remark = expressageDO.getRemark();
                return  sendDispensingToHisToHospital(registerNo,cardNo,isExpress,sfOrder,address,phone,remark);
            }
        }
        return null;

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

@@ -1597,14 +1597,14 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        //2.判断是否有未结束的
        List<WlyyOutpatientDO> list = new ArrayList<>();
        if(StringUtils.isNotBlank(outpatientType)&&(outpatientType.equalsIgnoreCase("3")||outpatientType.equalsIgnoreCase("4"))){
        if(StringUtils.isNotBlank(outpatientType)&&(outpatientType.equalsIgnoreCase("3")||outpatientType.equalsIgnoreCase("4")||outpatientType.equalsIgnoreCase("5"))){
            list = outpatientDao.findByPatientAndDoctorList(patient,outpatientType);
        }else {
            list = outpatientDao.findByPatientList(patient);
        }
        if (list != null && list.size() > 0) {
            if(!list.get(0).getOutpatientType().equalsIgnoreCase("3")){
            if(list.get(0).getOutpatientType().equalsIgnoreCase("1")){
                rs.put("outpatient", list.get(0));
                rs.put("code", -2);
                rs.put("mes", "存在未结束的诊断");

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/DsyyEntranceService.java

@@ -1013,7 +1013,7 @@ public class DsyyEntranceService {
                "\tv_internet_prescrip_master where 1=1 ";
        JSONArray array = new JSONArray();
        if (StringUtils.isNoneBlank(registerSn)){
            sql +=" and OUTPATIENTID = '"+registerSn+"' ";
            sql +=" and SERIALNO = '"+registerSn+"' ";
        }
        if (StringUtils.isNoneBlank(patNo)){
            sql +=" and PATIENTCODE = '"+patNo+"' ";
@@ -1053,9 +1053,9 @@ public class DsyyEntranceService {
     * @param
     * @throws Exception
     */
    public JSONArray getOutpatientDiagnosis(String registerSn,String patNo,String admNo,String realOrder,String startTime,String endTime) throws Exception {
    public JSONArray getOutpatientDiagnosis(String registerSn) throws Exception {
        String sql ="SELECT\n" +
                "\tREALORDER as \"REALORDER\",\n" +
                "\tSERIALNO as \"SERIALNO\",\n" +
                "\tCODE AS \"CODE\",\n" +
                "\tNAME AS \"NAME\",\n" +
                "\tTYPE AS \"TYPE\",\n" +
@@ -1064,22 +1064,7 @@ public class DsyyEntranceService {
                "\tv_internet_sick_diagnosis_info where 1=1 ";
        JSONArray array = new JSONArray();
        if (StringUtils.isNoneBlank(registerSn)){
            sql +=" and REGISTERNO = '"+registerSn+"' ";
        }
        if (StringUtils.isNoneBlank(patNo)){
            sql +=" and patient = '"+patNo+"' ";
        }
        if (StringUtils.isNoneBlank(patNo)){
            sql +=" and admNo = '"+admNo+"' ";
        }
        if (StringUtils.isNoneBlank(realOrder)){
            sql+=" and realOrder ='"+realOrder+"' ";
        }
        if (StringUtils.isNoneBlank(startTime)){
            sql +=" and CREATETIME >= to_date('"+startTime+"','yyyy-MM-dd HH24:mi:ss') ";
        }
        if (StringUtils.isNoneBlank(endTime)){
            sql +=" and CREATETIME <= to_date('"+endTime+"','yyyy-MM-dd HH24:mi:ss') ";
            sql +=" and SERIALNO = '"+registerSn+"' ";
        }
        Map<String,Object> params = new HashedMap();
        params.put("sql",sql);
@@ -1103,52 +1088,33 @@ public class DsyyEntranceService {
     * @param
     * @throws Exception
     */
    public JSONArray getOutpatientDrugInfo(String registerSn,String patNo,String admNo,String realOrder,String startTime,String endTime) throws Exception {
    public JSONArray getOutpatientDrugInfo(String realOrder) throws Exception {
        String sql ="SELECT\n" +
                "\tREALORDER as \"REALORDER\",\n" +
                "\tDRUGNO AS \"DRUGNO\",\n" +
                "\tDRUGNAME AS \"DRUGNAME\",\n" +
                "\tDISPDEPOSITE AS \"DISPDEPOSITE\",\n" +
                "\tCODE AS \"DRUGNO\",\n" +
                "\tNAME AS \"DRUGNAME\",\n" +
                "\tDOSAGE AS \"DOSAGE\",\n" +
                "  QUANTITY as \"QUANTITY\",\n" +
                "\tDRUGNO AS \"UNIT\",\n" +
                "\tDRUGNAME AS \"UNITNAME\",\n" +
                "\tDISPDEPOSITE AS \"PACKUNITNAME\",\n" +
                "\tDOSAGE AS \"PACKUNIT\",\n" +
                "\tUSAGECODE as \"USAGECODE\",\n" +
                "\tUSAGENAME as \"USAGENAME\",\n" +
                "  TOTAL_DOSEAGE as \"QUANTITY\",\n" +
                "\tUNIT AS \"UNIT\",\n" +
                "\tUNIT AS \"UNITNAME\",\n" +
                "\tTOTAL_UNIT AS \"PACKUNITNAME\",\n" +
                "\tTOTAL_UNIT AS \"PACKUNIT\",\n" +
                "\tSUPPLYCODE as \"SUPPLYCODE\",\n" +
                "\tSUPPLYNAME as \"SUPPLYNAME\",\n" +
                "\tSUPPLYCODE as \"SUPPLYNAME\",\n" +
                "\tDAYS as \"DAYS\",\n" +
                "\tFREQUENCY as \"FREQUENCY\",\n" +
                "\tSERIAL as \"SERIAL\",\n" +
                "\tSPECIFICATION as \"SPECIFICATION\",\n" +
                "\tPACKRETPRICE as \"PACKRETPRICE\",\n" +
                "\tHERBALCOUNT as \"HERBALCOUNT\",\n" +
                "\tPOSTCOUNT as \"POSTCOUNT\",\n" +
                "\tDEL as \"DEL\",\n" +
                "\tCOMM as \"COMM\"\n" +
                "\tUSAGECODE as \"USAGECODE\",\n" +
                "\tUSAGECODE as \"USAGENAME\",\n" +
                "\tUSAGECODE as \"FREQUENCY\",\n" +
                "\tcost as \"cost\",\n" +
                "\tSPECIFICATION as \"SPECIFICATION\"\n" +
                "FROM\n" +
                "\tv_internet_prescrip_detail where 1=1 ";
        JSONArray array = new JSONArray();
        if (StringUtils.isNoneBlank(registerSn)){
            sql +=" and REGISTERNO = '"+registerSn+"' ";
        }
        if (StringUtils.isNoneBlank(patNo)){
            sql +=" and patient = '"+patNo+"' ";
        }
        if (StringUtils.isNoneBlank(patNo)){
            sql +=" and admNo = '"+admNo+"' ";
        }
        if (StringUtils.isNoneBlank(realOrder)){
            sql+=" and realOrder ='"+realOrder+"' ";
        }
        if (StringUtils.isNoneBlank(startTime)){
            sql +=" and CREATETIME >= to_date('"+startTime+"','yyyy-MM-dd HH24:mi:ss') ";
        }
        if (StringUtils.isNoneBlank(endTime)){
            sql +=" and CREATETIME <= to_date('"+endTime+"','yyyy-MM-dd HH24:mi:ss') ";
        }
        Map<String,Object> params = new HashedMap();
        params.put("sql",sql);
        logger.info("cardNo："+sql);

svr/svr-internet-hospital-entrance/src/main/java/com/yihu/jw/entrance/controller/DsyyController.java

@@ -603,7 +603,7 @@ public class DsyyController extends EnvelopRestEndpoint {
    @PostMapping(value = "/selectReportInfo")
    @ApiOperation(value = "查询出院小结、门诊病历")
    public ListEnvelop selectEmrInfoId(@ApiParam(name = "serviceCode", value = "接口编码", required = false)
    public ListEnvelop selectReportInfo(@ApiParam(name = "serviceCode", value = "接口编码", required = false)
                                           @RequestParam(value = "serviceCode",required = false)String serviceCode,
                                        @ApiParam(name = "patientId", value = "患者id", required = false)
                                       @RequestParam(value = "patientId",required = false)String patientId,

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/prescription/PrescriptionEndpoint.java

@@ -322,7 +322,7 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
            } else if (wxId.equalsIgnoreCase("xm_hcyy_wx")) {
                obj = hcyyPrescriptionService.selectOriginPrescriptionListLocal(registerSn,patNo,admNo,realOrder);
            } else if (wxId.equalsIgnoreCase("xm_dsyy_wx")) {
                obj = dsyyPrescriptionService.selectOriginPrescriptionList(registerSn, patNo, realOrder, admNo);
                obj = dsyyPrescriptionService.selectOriginPrescriptionList(registerSn, patNo,admNo,realOrder);
            }else {
                return ListEnvelop.getError("尚未开发！");
            }