Merge branch 'dev' of yeshijie/patient-co-management into dev

patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/controller/PrescriptionController.java

@@ -169,10 +169,14 @@ public class PrescriptionController extends BaseController{
	@RequestMapping(value = "saveRecipe",method = RequestMethod.POST)
	@ApiOperation("挂号开处方接口,调整处方接口")
	public Result saveRecipe(@ApiParam(name="prescriptionCode",value="续方code",defaultValue = "123")
							 @RequestParam(value = "prescriptionCode",required = true) String prescriptionCode)
							 @RequestParam(value = "prescriptionCode",required = true) String prescriptionCode,
							 @ApiParam(name="jwRegisterType",value="挂号类型",defaultValue = "123")
							 @RequestParam(value = "jwRegisterType",required = true) String jwRegisterType,
							 @ApiParam(name="jwDept",value="基位科室编码",defaultValue = "123")
							 @RequestParam(value = "jwDept",required = true) String jwDept)
	{
		try {
			String re = prescriptionService.saveRecipe(prescriptionCode);
			String re = prescriptionService.saveRecipe(prescriptionCode,jwRegisterType,jwDept);
//			String re = "{\"CODE\":\"1\",\"returnData\":[[{\"VISIT_NO\":\"3277875\",\"RECIPE_NO\":\"5477158\"}]],\"byRefParaData\":[{ \"errorMsg\": \"\" }]}";
//			String re = prescriptionService.testSaveRecipe();

patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/service/prescription/PrescriptionService.java

@@ -534,7 +534,7 @@ public class PrescriptionService extends ZysoftBaseService{
     * @return
     * @throws Exception
     */
    public String saveRecipe(String prescriptionCode)  throws Exception
    public String saveRecipe(String prescriptionCode,String jwRegisterType,String jwDept)  throws Exception
    {
        Prescription prescription = prescriptionDao.findByCode(prescriptionCode);
@@ -550,10 +550,10 @@ public class PrescriptionService extends ZysoftBaseService{
        JSONObject json = new JSONObject();
        json.put("cardNo",prescription.getSsc());// "cardNo": "病人卡号",
        json.put("saveDept",prescription.getJwDeptCode());//开单科室编码
        json.put("saveDept",jwDept);//开单科室编码
        json.put("saveOperator",prescription.getJwDoctorCode());// "saveOperator": "开单人员编码",
        json.put("RATE_TYPE","2");//费别类型编码
        json.put("REGISTER_TYPE",prescription.getJwGisterTypeCode());//挂号类型编码
        json.put("REGISTER_TYPE",jwRegisterType);//挂号类型编码
        List<PrescriptionDiagnosis> prescriptionDiagnosisList = prescriptionDiagnosisDao.findByPrescriptionCode(prescriptionCode);
        json.put("DIAGNOSE_CODE",prescriptionDiagnosisList.get(0).getCode());//"DIAGNOSE_CODE": "诊断编码",
        if(prescriptionDiagnosisList.size()>1){

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/prescription/PrescriptionInfoService.java

@@ -372,7 +372,7 @@ public class PrescriptionInfoService extends BaseService {
    public int upLoadPrescriotionState(String state, Prescription p, PrescriptionReviewed reviewed) throws Exception {
        //医生审核通过，发起开方及预结算
        if ("1".equals(state)) {
            String rs = jwPrescriptionService.saveRecipe(p.getCode());
            String rs = jwPrescriptionService.saveRecipe(p.getCode(),p.getJwGisterTypeCode(),p.getJwDeptCode());
            com.alibaba.fastjson.JSONObject respone = com.alibaba.fastjson.JSONObject.parseObject(rs);
            int st = respone.getInteger("status");
            com.alibaba.fastjson.JSONObject data = respone.getJSONObject("data");

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/third/jw/JwPrescriptionService.java

@@ -123,12 +123,14 @@ public class JwPrescriptionService {
     * @return
     * @throws Exception
     */
    public String saveRecipe(String prescriptionCode){
    public String saveRecipe(String prescriptionCode,String jwRegisterType,String jwDept){
        String response = null;
        try {
            String url = jwUrl + "/third/prescription/saveRecipe";
            List<NameValuePair> params = new ArrayList<>();
            params.add(new BasicNameValuePair("prescriptionCode", prescriptionCode));
            params.add(new BasicNameValuePair("jwRegisterType", jwRegisterType));
            params.add(new BasicNameValuePair("jwDept", jwDept));
            response = httpClientUtil.post(url, params, "UTF-8");
            return response;