处方查询修改

business/es-service/src/main/java/com/yihu/jw/es/service/StatisticsEsService.java

@@ -3497,14 +3497,14 @@ public class StatisticsEsService {
            object.put("data3",arraytotal);
        }
        if (StringUtils.isNoneBlank(level2_type)){
            //问诊量表格
            List<SaveModel> outpatientList = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, indexes[0], SaveModel.timeLevel_DDL,"","",level2_type);
            //开具处方数量
            Double preNum = 0.0;
            Double outNum = 0.0;
            String prescriptionRate ="";
            List<SaveModel> precriptionList = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, indexes[1], SaveModel.timeLevel_DDL,"","",level2_type);
            if(SaveModel.OrgLevel.equals(level2_type)){
                //问诊量表格
                List<SaveModel> outpatientList = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, indexes[0], SaveModel.timeLevel_DDL,"","",level2_type);
                //开具处方数量
                Double preNum = 0.0;
                Double outNum = 0.0;
                String prescriptionRate ="";
                List<SaveModel> precriptionList = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, indexes[1], SaveModel.timeLevel_DDL,"","",level2_type);
                for(SaveModel saveModel:precriptionList){
                    preNum = saveModel.getResult1();
                    JSONObject jsonObject = new JSONObject();
@@ -3512,24 +3512,23 @@ public class StatisticsEsService {
                    jsonObject.put("hospitalName",saveModel.getHospitalName());
                    jsonObject.put("specialist",saveModel.getResult1());
                    for(SaveModel saveModel1:outpatientList){
                        if(saveModel1.getHospital().equalsIgnoreCase(saveModel.getHospital())){
                        String out=saveModel1.getHospital()==null?"":saveModel1.getHospital();
                        String pre=saveModel.getHospital()==null?"":saveModel.getHospital();
                        if(out.equalsIgnoreCase(pre)){
                            outNum = saveModel1.getResult1();
                            prescriptionRate = getRange(preNum.intValue(),outNum.intValue(),0);
                            jsonObject.put("prescriptionRate",prescriptionRate);
                            break;
                        }
                    }
                    resultArray.add(jsonObject);
                    if(null==saveModel.getHospital()){
                        resultArray =new JSONArray();
                    }else {
                        resultArray.add(jsonObject);
                    }
                }
            }
            if(SaveModel.doctorLevel.equals(level2_type)){
                //问诊量表格
                List<SaveModel> outpatientList = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, indexes[0], SaveModel.timeLevel_ZL,"","",level2_type);
                //开具处方数量
                Double preNum = 0.0;
                Double outNum = 0.0;
                String prescriptionRate ="";
                List<SaveModel> precriptionList = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, indexes[1], SaveModel.timeLevel_ZL,"","",level2_type);
                for(SaveModel saveModel:precriptionList){
                    preNum = saveModel.getResult1();
                    JSONObject jsonObject = new JSONObject();
@@ -3547,25 +3546,24 @@ public class StatisticsEsService {
                    jsonObject.put("doctorName",saveModel.getDoctorName());
                    jsonObject.put("doctorcode",saveModel.getDoctor());
                    for(SaveModel saveModel1:outpatientList){
                        if(saveModel1.getDoctor().equalsIgnoreCase(saveModel.getDoctor())){
                        String outdoc=saveModel1.getDoctor()==null?"":saveModel1.getDoctor();
                        String predoc=saveModel.getDoctor()==null?"":saveModel.getDoctor();
                        if(outdoc.equalsIgnoreCase(predoc)){
                            outNum = saveModel1.getResult1();
                            prescriptionRate = getRange(preNum.intValue(),outNum.intValue(),0);
                            jsonObject.put("prescriptionRate",prescriptionRate);
                            break;
                        }
                    }
                    resultArray.add(jsonObject);
                    if(null==saveModel.getDoctor()){
                        resultArray =new JSONArray();
                    }else {
                        resultArray.add(jsonObject);
                    }
                }
            }
            if(SaveModel.deptLevel.equals(level2_type)){
                //问诊量表格
                List<SaveModel> outpatientList = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, indexes[0], SaveModel.timeLevel_ZL,"","",level2_type);
                //开具处方数量
                Double preNum = 0.0;
                Double outNum = 0.0;
                String prescriptionRate ="";
                List<SaveModel> precriptionList = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, indexes[1], SaveModel.timeLevel_ZL,"","",level2_type);
                for(SaveModel saveModel:precriptionList){
                    preNum = saveModel.getResult1();
                    JSONObject jsonObject = new JSONObject();
@@ -3575,18 +3573,23 @@ public class StatisticsEsService {
                    jsonObject.put("deptName",saveModel.getDeptName());
                    jsonObject.put("specialist",saveModel.getResult1());
                    for(SaveModel saveModel1:outpatientList){
                        if(saveModel1.getDept().equalsIgnoreCase(saveModel.getDept())){
                        String out=saveModel1.getDept()==null?"":saveModel1.getDept();
                        String pre=saveModel.getDept()==null?"":saveModel.getDept();
                        if(out.equalsIgnoreCase(pre)){
                            outNum = saveModel1.getResult1();
                            prescriptionRate = getRange(preNum.intValue(),outNum.intValue(),0);
                            jsonObject.put("prescriptionRate",prescriptionRate);
                            break;
                        }
                    }
                    resultArray.add(jsonObject);
                    if(null==saveModel.getDept()){
                        resultArray =new JSONArray();
                    }else {
                        resultArray.add(jsonObject);
                    }
                }
            }
            object.put("excelData",resultArray);
        }else {
            //问诊量表格
            List<SaveModel> outpatientList = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, indexes[0], SaveModel.timeLevel_DDL,"","","4");
@@ -3606,16 +3609,23 @@ public class StatisticsEsService {
                jsonObject.put("doctorName",saveModel.getDoctorName());
                jsonObject.put("doctorcode",saveModel.getDoctor());
                for(SaveModel saveModel1:outpatientList){
                    if(saveModel1.getHospital().equalsIgnoreCase(saveModel.getHospital())){
                    String out=saveModel1.getHospital()==null?"":saveModel1.getHospital();
                    String pre=saveModel.getHospital()==null?"":saveModel.getHospital();
                    if(out.equalsIgnoreCase(pre)){
                        outNum = saveModel1.getResult1();
                        prescriptionRate = getRange(preNum.intValue(),outNum.intValue(),0);
                        jsonObject.put("prescriptionRate",prescriptionRate);
                        break;
                    }
                }
                resultArray.add(jsonObject);
                if(null==saveModel.getHospital()){
                    resultArray =new JSONArray();
                }else {
                    resultArray.add(jsonObject);
                }
            }
        }
        object.put("excelData",resultArray);
        return object;
    }
    /**
@@ -3662,14 +3672,17 @@ public class StatisticsEsService {
            object.put("data3",arraytotal);
        }
        if (StringUtils.isNoneBlank(level2_type)) {
            List<SaveModel> outpatientList = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, indexes[0], SaveModel.timeLevel_DDL, "", "", level2_type);
            //开具处方数量
            Double preNum = 0.0;
            Double outNum = 0.0;
            String prescriptionRate = "";
            List<SaveModel> precriptionList = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, indexes[1], SaveModel.timeLevel_DDL, "", "", level2_type);
            if(precriptionList.get(0).getHospital()==null){
                resultArray.add(null);
            }
            if (SaveModel.OrgLevel.equals(level2_type)) {
                //问诊量表格
                List<SaveModel> outpatientList = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, indexes[0], SaveModel.timeLevel_DDL, "", "", level2_type);
                //开具处方数量
                Double preNum = 0.0;
                Double outNum = 0.0;
                String prescriptionRate = "";
                List<SaveModel> precriptionList = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, indexes[1], SaveModel.timeLevel_DDL, "", "", level2_type);
                for (SaveModel saveModel : precriptionList) {
                    preNum = saveModel.getResult1();
                    JSONObject jsonObject = new JSONObject();
@@ -3677,24 +3690,23 @@ public class StatisticsEsService {
                    jsonObject.put("hospitalName", saveModel.getHospitalName());
                    jsonObject.put("specialist", saveModel.getResult1());
                    for (SaveModel saveModel1 : outpatientList) {
                        if (saveModel1.getHospital().equalsIgnoreCase(saveModel.getHospital())) {
                        String out=saveModel1.getHospital()==null?"":saveModel1.getHospital();
                        String pre=saveModel.getHospital()==null?"":saveModel.getHospital();
                        if(out.equalsIgnoreCase(pre)){
                            outNum = saveModel1.getResult1();
                            prescriptionRate = getRange(preNum.intValue(), outNum.intValue(), 0);
                            jsonObject.put("prescriptionRate", prescriptionRate);
                            break;
                        }
                    }
                    resultArray.add(jsonObject);
                    if(null==saveModel.getHospital()){
                        resultArray =new JSONArray();
                    }else {
                        resultArray.add(jsonObject);
                    }
                }
            }
            if (SaveModel.doctorLevel.equals(level2_type)) {
                //问诊量表格
                List<SaveModel> outpatientList = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, indexes[0], SaveModel.timeLevel_ZL, "", "", level2_type);
                //开具处方数量
                Double preNum = 0.0;
                Double outNum = 0.0;
                String prescriptionRate = "";
                List<SaveModel> precriptionList = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, indexes[1], SaveModel.timeLevel_ZL, "", "", level2_type);
                for (SaveModel saveModel : precriptionList) {
                    preNum = saveModel.getResult1();
                    JSONObject jsonObject = new JSONObject();
@@ -3706,25 +3718,24 @@ public class StatisticsEsService {
                    jsonObject.put("doctorName", saveModel.getDoctorName());
                    jsonObject.put("doctorcode", saveModel.getDoctor());
                    for (SaveModel saveModel1 : outpatientList) {
                        if (saveModel1.getDoctor().equalsIgnoreCase(saveModel.getDoctor())) {
                        String out=saveModel1.getDoctor()==null?"":saveModel1.getDoctor();
                        String pre=saveModel.getDoctor()==null?"":saveModel.getDoctor();
                        if(out.equalsIgnoreCase(pre)){
                            outNum = saveModel1.getResult1();
                            prescriptionRate = getRange(preNum.intValue(), outNum.intValue(), 0);
                            jsonObject.put("prescriptionRate", prescriptionRate);
                            break;
                        }
                    }
                    resultArray.add(jsonObject);
                    if(null==saveModel.getDoctor()){
                        resultArray =new JSONArray();
                    }else {
                        resultArray.add(jsonObject);
                    }
                }
            }
            if (SaveModel.deptLevel.equals(level2_type)) {
                //问诊量表格
                List<SaveModel> outpatientList = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, indexes[0], SaveModel.timeLevel_ZL, "", "", level2_type);
                //开具处方数量
                Double preNum = 0.0;
                Double outNum = 0.0;
                String prescriptionRate = "";
                List<SaveModel> precriptionList = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, indexes[1], SaveModel.timeLevel_ZL, "", "", level2_type);
                for (SaveModel saveModel : precriptionList) {
                    preNum = saveModel.getResult1();
                    JSONObject jsonObject = new JSONObject();
@@ -3735,14 +3746,20 @@ public class StatisticsEsService {
                    jsonObject.put("name", saveModel.getHospitalName());
                    jsonObject.put("specialist", saveModel.getResult1());
                    for (SaveModel saveModel1 : outpatientList) {
                        if (saveModel1.getDept().equalsIgnoreCase(saveModel.getDept())) {
                        String out=saveModel1.getDept()==null?"":saveModel1.getDept();
                        String pre=saveModel.getDept()==null?"":saveModel.getDept();
                        if(out.equalsIgnoreCase(pre)){
                            outNum = saveModel1.getResult1();
                            prescriptionRate = getRange(preNum.intValue(), outNum.intValue(), 0);
                            jsonObject.put("prescriptionRate", prescriptionRate);
                            break;
                        }
                    }
                    resultArray.add(jsonObject);
                    if(null==saveModel.getDept()){
                        resultArray =new JSONArray();
                    }else {
                        resultArray.add(jsonObject);
                    }
                }
            }
@@ -3764,14 +3781,20 @@ public class StatisticsEsService {
                jsonObject.put("doctorName", saveModel.getDoctorName());
                jsonObject.put("doctorcode", saveModel.getDoctor());
                for (SaveModel saveModel1 : outpatientList) {
                    if (saveModel1.getHospital().equalsIgnoreCase(saveModel.getHospital())) {
                    String out=saveModel1.getHospital()==null?"":saveModel1.getHospital();
                    String pre=saveModel.getHospital()==null?"":saveModel.getHospital();
                    if(out.equalsIgnoreCase(pre)){
                        outNum = saveModel1.getResult1();
                        prescriptionRate = getRange(preNum.intValue(), outNum.intValue(), 0);
                        jsonObject.put("prescriptionRate", prescriptionRate);
                        break;
                    }
                }
                resultArray.add(jsonObject);
                if(null==saveModel.getHospital()){
                    resultArray =new JSONArray();
                }else {
                    resultArray.add(jsonObject);
                }
            }
        }
        return object;

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/consult/KnowledgeArticleService.java

@@ -343,9 +343,12 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDO,
                "b.dept_name as \"deptName\",b.org_name as \"hospitalName\" from wlyy_knowledge_article t left join wlyy_knowledge_article_dept a " +
                " on a.article_id = t.id left join base_doctor_hospital b on b.doctor_code = t.create_user" +
				" left join base_doctor c on c.id = t.create_user where 1=1 and t.del = 1";
		if (StringUtils.isNotBlank(categoryFirst)&&StringUtils.isNotBlank(categorySecond)){
		    sql+=" and t.category_first = '"+categoryFirst+"' and t.category_second ='"+categorySecond+"'";
		if (StringUtils.isNotBlank(categoryFirst)){
		    sql+=" and t.category_first = '"+categoryFirst+"'";
        }
		if (StringUtils.isNotBlank(categorySecond)){
			sql+=" and t.category_second ='"+categorySecond+"'";
		}
        if (StringUtils.isNotBlank(keyWords)){
            sql+=" and (t.create_user_name like '%"+keyWords+"%' or t.title like '%"+keyWords+"%' or t.content like '%"+keyWords+"%' or a.dept_name like '%"+keyWords+"%' )";
        }

svr/svr-internet-hospital/src/main/resources/application.yml

@@ -305,6 +305,8 @@ es:
  host:  http://192.0.33.26:9200
  tHost: 192.0.33.26:9300
  clusterName: jkzl
  user: lion
  password: jkzlehr
# 上传文件临时路径配置
FileTempPath:
@@ -759,7 +761,8 @@ es:
  tHost: 172.16.100.240:9300
  clusterName: jkzl
  securityUser: lion:jkzlehr
  user: lion
  password: jkzlehr
qywx:
  url: 1
  id: 2
@@ -832,6 +835,8 @@ es:
  tHost: 172.26.0.190:9300
  clusterName: jkzl
  securityUser: elastic:changeme
  user: lion
  password: jkzlehr
# 上传文件临时路径配置
FileTempPath: