Merge branch 'dev' of trick9191/wlyy2.0 into dev

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

@@ -1,14 +1,23 @@
package com.yihu.jw.hospital.prescription.service;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.entity.hospital.hisview.WlyyHisJcmbDO;
import com.yihu.jw.entity.hospital.prescription.WlyyInspectionPartsDictDO;
import com.yihu.jw.entity.hospital.prescription.WlyyPrescriptionDO;
import com.yihu.jw.hospital.dict.WlyyHospitalSysDictDao;
import com.yihu.jw.hospital.his.dao.WlyyHisJcmbDao;
import com.yihu.jw.hospital.his.dao.WlyyHisJymbDao;
import com.yihu.jw.hospital.his.dao.WlyyHisTcxzDao;
import com.yihu.jw.hospital.prescription.dao.InspectionPartsDictDao;
import com.yihu.jw.hospital.prescription.dao.PrescriptionDao;
import com.yihu.jw.hospital.prescription.service.entrance.EntranceService;
import com.yihu.mysql.query.BaseJpaService;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@@ -16,12 +25,25 @@ import java.util.List;
 * Created by Trick on 2019/9/26.
 */
@Service
@Transactional
public class InspectionService extends BaseJpaService<WlyyPrescriptionDO, PrescriptionDao> {
    @Value("${demo.flag}")
    private boolean demoFlag;
    @Autowired
    private InspectionPartsDictDao inspectionPartsDictDao;
    @Autowired
    private WlyyHospitalSysDictDao hospitalSysDictDao;
    @Autowired
    private EntranceService entranceService;
    @Autowired
    private WlyyHisJcmbDao hisJcmbDao;
    @Autowired
    private WlyyHisJymbDao hisJymbDao;
    @Autowired
    private WlyyHisTcxzDao hisTcxzDao;
    public List<WlyyInspectionPartsDictDO> findByPartsCode(String parentCode){
        return inspectionPartsDictDao.findByParentCode(parentCode);
@@ -31,5 +53,28 @@ public class InspectionService extends BaseJpaService<WlyyPrescriptionDO, Prescr
        return hospitalSysDictDao.findByHospitalAndDictName(hospital,name);
    }
    /**
     *
     * S60线上复诊 BS25033检查模板接口
     * @return
     * @throws Exception
     */
    public Boolean synJcmb()throws Exception{
        JSONArray jsonArray = entranceService.BS25033("",demoFlag);
        if(jsonArray!=null&&jsonArray.size()>0){
            for(int i=0;i<jsonArray.size();i++){
                JSONObject jcmb = jsonArray.getJSONObject(i);
                WlyyHisJcmbDO jcmbDO = new WlyyHisJcmbDO();
                jcmbDO.setTcNo(jcmb.getString("tc_no"));
                jcmbDO.setTcName(jcmb.getString("tc_name"));
                jcmbDO.setBzCode(jcmb.getString("bz_code"));
                jcmbDO.setBzName(jcmb.getString("bz_name"));
                jcmbDO.setChargeCode(jcmb.getString("charge_code"));
            }
        }
        return true;
    }
}

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

@@ -1159,8 +1159,8 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
     * 获取检查检验
     * @return
     */
    public JSONArray getInspectionDictionary(String pyKey,String winNo)throws Exception{
        JSONArray rs = entranceService.MS25002(pyKey,winNo,demoFlag);
    public JSONArray getInspectionDictionary(String pyKey,String codes,String winNo)throws Exception{
        JSONArray rs = entranceService.MS25002(pyKey,codes,winNo,demoFlag);
        if(rs!=null&&rs.size()>0){
            //设置科室翻译名称字典，减少循环层级降低循环次数
@@ -1365,7 +1365,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            prescription.setStatus(13);
            prescriptionDao.save(prescription);
            result.put("code",-1);
            result.put("mes","开方提交失败");
            result.put("mes",jsonObject.getString("@MSG"));
            //记录开发失败日志
            prescriptionLogService.addPrescriptionLog(prescription.getId(),13,2,outpatientDO.getDoctor(),outpatientDO.getDoctorName(),"",new Date());

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

@@ -802,7 +802,7 @@ public class EntranceService {
        ObjectMapper objectMapper = new ObjectMapper();
        List<WlyyHisPrescriptionVO> patientSubscribeJkedus = objectMapper.readValue(jsonData,  new TypeReference<List<WlyyHisPrescriptionVO>>(){});
        String resp="";
        if (demoFlag) {
        if (false) {
            resp = getJosnFileResullt(fid);
        } else {
            StringBuffer sbs = new StringBuffer();
@@ -1122,7 +1122,7 @@ public class EntranceService {
     * @return
     * @throws Exception
     */
    public JSONArray MS25002(String py_code,String win_no,Boolean demoFlag) throws Exception {
    public JSONArray MS25002(String py_code,String codes,String win_no,Boolean demoFlag) throws Exception {
        String fid="MS25002";
        String  resp = "";
        if (demoFlag) {
@@ -1140,6 +1140,16 @@ public class EntranceService {
                logger.info("py_code="+py_code);
                sbs.append("<query compy=\"like\" item=\"py_code\" splice=\"and\" value=\"'%"+py_code+"%'\"/>");
            }
            if(StringUtils.isNotBlank(codes)){
                String groups[] = codes.split(",");
                String inSql = "";
                for(String group:groups){
                    inSql+="'"+group+"'"+",";
                }
                inSql = inSql.substring(0,inSql.length()-1);
                sbs.append("<query compy=\"in\" item=\"code\" splice=\"and\" value=\"("+inSql+")\"/>");
            }
            if(StringUtils.isNotBlank(win_no)){
                sbs.append("<query compy=\"=\" item=\"win_no\" splice=\"and\" value=\"'"+win_no+"'\"/>");
            }

server/svr-configuration/src/main/resources/application.yml

@@ -15,7 +15,8 @@ eureka:
    healthcheck:
      enabled: false #启动监控检查，
    serviceUrl: # 默认正式线地址
      defaultZone: http://jw:jkzl@172.16.1.42:8761/eureka
#      defaultZone: http://jw:jkzl@172.16.1.42:8761/eureka
      defaultZone: http://jw:jkzl@192.0.33.26:8762/eureka
  instance:
    #eurika使用IP不使用host
    prefer-ip-address: true

server/svr-discovery/src/main/resources/application.yml

@@ -3,7 +3,8 @@ spring:
    enabled: false
server:
  port: 8761
  port: 8761 # 外网互联网医院内网服务
#   port: 8762 # 互联网医院内网服务
#eureka界面的账号密码
security:

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

@@ -279,8 +279,10 @@ public class MqSdkController extends EnvelopRestEndpoint {
    public ListEnvelop MS25002( @ApiParam(name = "pyCode", value = "拼音码")
                           @RequestParam(value = "pyCode", required = false) String pyCode,
                           @ApiParam(name = "winNo", value = "库存")
                           @RequestParam(value = "winNo", required = false) String winNo) throws Exception {
        JSONArray obj = entranceService.MS25002(pyCode, winNo,demoFlag);
                           @RequestParam(value = "winNo", required = false) String winNo,
                           @ApiParam(name = "codes", value = "检查检验收费码codes，逗号分割")
                           @RequestParam(value = "codes", required = false) String codes) throws Exception {
        JSONArray obj = entranceService.MS25002(pyCode,codes,winNo,demoFlag);
        return success(obj);
    }
@@ -433,7 +435,7 @@ public class MqSdkController extends EnvelopRestEndpoint {
        return success(obj);
    }
    @GetMapping(value = "/MS02015套餐子项目字典接口")
    @GetMapping(value = "/MS02015")
    @ApiOperation(value = "MS02015套餐子项目字典接口")
    public ObjEnvelop MS02015(
            @ApiParam(name = "child_code", value = "入参条件为子项目编码")

svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/job/InternetUpdateJob.java

@@ -48,9 +48,9 @@ public class InternetUpdateJob implements Job {
            res = internetService.upNsOnlineAsk(startDate,endDate);
            logger.info("END==========2.8 网络咨询服务信息结束========" + res);
            logger.info("START========2.9 网络咨询服务信息开始========");
            logger.info("START========2.9 网络诊疗服务信息========");
            res = internetService.upNsOnlineMed(startDate,endDate);
            logger.info("END==========2.9 网络咨询服务信息结束========" + res);
            logger.info("END==========2.9 网络诊疗服务信息========" + res);
            logger.info("START========2.10 电子处方表开始========");
            res = internetService.upPrescription(startDate,endDate);

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/consult/DoctorConsultEndpoint.java

@@ -145,7 +145,8 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
				if("0".equals(rsCode)||"-2".equals(rsCode)){
					//挂号成功，已经挂号
				}else{
					failed("挂号失败！无法发起咨询");
					String mes = (String)res.get("@MSG");
					failed(mes);
				}
				logger.info("调用挂号接口====END");
				

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

@@ -641,8 +641,10 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
    public ListEnvelop getInspectionDictionary(@ApiParam(name = "pyKey", value = "拼音码")
                                              @RequestParam(value = "pyKey", required = true)String pyKey,
                                              @ApiParam(name = "winNo", value = "6总部7金榜8夏禾")
                                              @RequestParam(value = "winNo", required = true)String winNo)throws Exception{
        return success(prescriptionService.getInspectionDictionary(pyKey,winNo));
                                              @RequestParam(value = "winNo", required = true)String winNo,
                                              @ApiParam(name = "codes", value = "检查检验收费码codes,用逗号分割")
                                              @RequestParam(value = "codes", required = true)String codes)throws Exception{
        return success(prescriptionService.getInspectionDictionary(pyKey,codes,winNo));
    }
    @GetMapping(value = BaseHospitalRequestMapping.Prescription.findPrescriptionLogByPreId)